Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Mon, 5 Apr 2010 14:19:20 +0000 (14:19 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Mon, 5 Apr 2010 14:19:20 +0000 (14:19 +0000)

Trivial merge